Merge "tests: Allow string to be passed to getTestUser() etc."

diff --git a/tests/phpunit/MediaWikiTestCase.php b/tests/phpunit/MediaWikiTestCase.php
index d675e85..dd85cc2 100644 (file)
--- a/tests/phpunit/MediaWikiTestCase.php
+++ b/tests/phpunit/MediaWikiTestCase.php
@@ -158,7 +158,7 @@ abstract class MediaWikiTestCase extends PHPUnit\Framework\TestCase {
         *
         * @since 1.28
         *
-        * @param string[] $groups Groups the test user should be in.
+        * @param string|string[] $groups Groups the test user should be in.
         * @return TestUser
         */
        public static function getTestUser( $groups = [] ) {
@@ -170,7 +170,7 @@ abstract class MediaWikiTestCase extends PHPUnit\Framework\TestCase {
         *
         * @since 1.28
         *
-        * @param string[] $groups Groups the test user should be added in.
+        * @param string|string[] $groups Groups the test user should be added in.
         * @return TestUser
         */
        public static function getMutableTestUser( $groups = [] ) {

diff --git a/tests/phpunit/includes/TestUserRegistry.php b/tests/phpunit/includes/TestUserRegistry.php
index 24aee24..3064a3d 100644 (file)
--- a/tests/phpunit/includes/TestUserRegistry.php
+++ b/tests/phpunit/includes/TestUserRegistry.php
@@ -28,7 +28,7 @@ class TestUserRegistry {
         *
         * @param string $testName Caller's __CLASS__. Used to generate the
         *  user's username.
-        * @param string[] $groups Groups the test user should be added to.
+        * @param string|string[] $groups Groups the test user should be added to.
         * @return TestUser
         */
        public static function getMutableTestUser( $testName, $groups = [] ) {
@@ -38,7 +38,7 @@ class TestUserRegistry {
                        "TestUser $testName $id",  // username
                        "Name $id",                // real name
                        "$id@mediawiki.test",      // e-mail
-                       $groups,                   // groups
+                       (array)$groups,            // groups
                        $password                  // password
                );
                $testUser->getUser()->clearInstanceCache();
@@ -54,11 +54,11 @@ class TestUserRegistry {
         *
         * @since 1.28
         *
-        * @param string[] $groups Groups the test user should be added to.
+        * @param string|string[] $groups Groups the test user should be added to.
         * @return TestUser
         */
        public static function getImmutableTestUser( $groups = [] ) {
-               $groups = array_unique( $groups );
+               $groups = array_unique( (array)$groups );
                sort( $groups );
                $key = implode( ',', $groups );